]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
environment: Remove transition tracking
authorFlorian Müllner <fmuellner@gnome.org>
Wed, 7 Aug 2019 00:28:40 +0000 (02:28 +0200)
committerFlorian Müllner <fmuellner@gnome.org>
Wed, 7 Aug 2019 00:40:17 +0000 (02:40 +0200)
The tracking was important in an earlier iteration, but as the helper
functions now remove overwritten transitions before setting up the
new ones, we can just as well connect to the ::stopped signal directly.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/668

js/ui/environment.js

index a248ea069d496cbc6c9efb6c484f26daa23bef1e..f2944a5c1bc13dd596e9925899f63c75c8d61c2f 100644 (file)
@@ -58,20 +58,6 @@ function _patchLayoutClass(layoutClass, styleProps) {
     };
 }
 
-let _easingTransitions = new Map();
-
-function _trackTransition(transition, callback) {
-    if (_easingTransitions.has(transition))
-        transition.disconnect(_easingTransitions.get(transition));
-
-    let id = transition.connect('stopped', (t, isFinished) => {
-        _easingTransitions.delete(transition);
-        callback(isFinished);
-    });
-
-    _easingTransitions.set(transition, id);
-}
-
 function _makeEaseCallback(params) {
     let onComplete = params.onComplete;
     delete params.onComplete;
@@ -136,7 +122,7 @@ function _easeActor(actor, params) {
         let transition = actor.get_transition(animatedProps[0]);
 
         if (transition)
-            _trackTransition(transition, callback);
+            transition.connect('stopped', (t, finished) => callback(finished));
         else
             callback(true);
     }
@@ -180,7 +166,7 @@ function _easeActorProperty(actor, propName, target, params) {
     transition.set_to(target);
 
     if (callback)
-        _trackTransition(transition, callback);
+        transition.connect('stopped', (t, finished) => callback(finished));
 }
 
 function _loggingFunc(...args) {